Fixed Some issues